From: Joakim Verona <joakim@verona.se>
Date: Tue, 27 Aug 2013 15:57:09 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=478550fa09602bf403812fc5597416c2a4aa441e;p=emacs.git

merge from trunk
---

478550fa09602bf403812fc5597416c2a4aa441e